CPP-149 - Token-aware tests and fixes