Refactor tests to avoid using subjects