fixed tests
added changes