Merge "add some tests for user api"