added more tests
fixed more tests