-Fixed tests
-Changed JTokenReader to provide line numbers for end tokens