Fix specs that broke because of rewriting the body
Clean up specs
Rubocop
Configure travis to run servers during tests