Changed to PSR4 loading, renamed tests