- change classes organisation so that the autoloader works with the tests