removed before blocks from rspec
bit more tidying