Feature cleanup

Adds some testing.