refactor more tests to use feature syntax