Removed test hack