fixing todo list
Expanding basic integration tests for *simple* methods
misc neatening. Mainly whitespace