more tests and updated class diagram