Refactor tests to individual subject matter.