refactored the specs

Improved the spec to make it more readable and eliminated unwanted specs.