changed dependcies so all relationship goes through test. Added
attributes to some entites so that it can easily be extended for teacher
reviewing.