Testing put on hold, attempting to refactor code to make writing tests simpler. Trying to find best solution to split large views file into smaler file