Fixed tests and handling of scope for owner password grant