implemented some more tests