updating tests to be feature based