Undo some simple test stuff