added more thorough tests to parser