Tidy ups from last @jpountz review -  use of constant, additional parser checking and Junit asserts