Removing the test stuff