Bugfix: modifying tests and classes