updated to tokenly and added tests