Converted remaining tests-register-test call into agregregated call