Add new test and parser bug fix