Merge "add unittest for create and list resource types association"