Implemented some more tests