Remove old test stuff