Updated to be autoloader friendly + PHPUnit