Added tests for ResolveOne