Fix problems in implemented class names
Adding forgotten classes
Adding more tests