Add tests and classes