Added more tests (not implemented yet)