Fixed tests: #CARE 21: Adding new forms to use in indicators