Feature tests

These changes will make your spec pass.