CFY-973 fixed test; modified test blueprints used for validation tests etc. to be simpler and not use types.yaml