Moved stuff around to fix the parser tests