Second pass for PSR-0 autoloading support. Fixed testing