Added missing test code back in