Updates for specs
WIP on cleaning up specs