Uncomment old test code; Move token testing to top

Signed-off-by: DanielFath <daniel.fath7@gmail.com>