added more tests, but 15 are still failing