More utils tests and removal of a bunch of parser code we didn't need