Refactored tests to support declaring Features in tests as annotations.