Remove test "shorthands"