Fixed Tests, added Token Generator, general fixes