Feature/clean up specs