Added tests and classes