added more tests to be fixed