Fix specs.
Clean up some specs