fixed naming, added tests
pushing to remote