Cleaned up some spec/steps