Comment Feature tests and make the rest pass