2 test class deprecation fixes and new secret token thingy