fixes #189 and other small bugs
tweaking old tests to run in new code for easy comparison to new specs