Move class under test to production package