Added more parsing unit tests