Features testing fixes

Only about 40% coverage, but the tests that are present do pass.

Some commits aren't necessary now.