Simplify parsing in tests