improved database_test.rb, and cleaned up unneeded files