updated tests
committing merged changes