added tests. Pushing to master!