Reworking to support test methods