Added test helper. Test mostly passing.
Tests are now passing