fixed tests, adding more tests