— implemented some more tests