Clean up specs
Add acceptance tests