changed order in which apps are loaded
rspec tests added