Fixing specs
Clean up specs