Remove circular require
Remove test database dependencies
Allow rdoc rake task loading to fail