Fix tests
Add tokens and status atomically