Update and fix features-related tests

There are a lot of broken tests right now. This updates & fixes a number of features-related tests. 

Note that this shows #196 as valid, but doesn't fix it.