Minor fixes, test fixes, etc

- Remove autoload statements
- Remove references to Test / Faking
- Fix broken S3 tests