Fixes in rspec file due to application structure changes