Move trait to better location
Add test paths to custom autoloader
Strip out manual class loading, now tests are autoloaded