Adding tests for features