Merge "Add aditional CRD tests"