Fix some tests because labels vs. variables is teh debil