Added tests and got parsing working again