added some more tests and modified the classes a bit Tests: Failing