Go through and rationalize / enhance pytests. Depends on #33
Go through and rationalize / enhance pytests.
Depends on #33