major test refactor, created reusable spces to apply to indicators