Unit test fixes

Unit test fixes

I've changed the naive bays behavior slightly, so that the 'None' feature is only added when there are actually missing features in some instances, so it doesn't appear when unnecessary, e.g. in unit tests.

Is this acceptable?