Modify test case to use customer and account cores