Added __autoload
Update test files