working on tests
tests passing