updated tests, added more tests