Implmented 2 more of the token tests. Also moved the helper fuctions to
a helper file.