Fix several unit tests
Finished addressing Ben's comments; need to test