added more tests (some failing)