Iterating on test further
Fixing up test suite and looking good