Changes to TestSub