Added more tests, for code not implemented yet