wrote a few more tests
added .metadata into .gitignore
fixing merging issues