Test Hack removed