fixing and cleaning up specs