added more tests (commented)