Some more tests and classes added.