Updated JUnit tests and specification read-in

When reading in the specifications, regex references in tokens are now
replaced by the proper regex. Also, the JUnit test file was updated and
corrected.