Created tests for Tokens.java and made some minor corrections.