Added more tests, fixed errors on OmiParser.