fixed tests deleted obsolete ones. need moar token tests