Clean feature tests written by zeus

- These tests are a work in progress.