Aggregate prepare method in cache.

Plus making all tests accessible and cleaning them up.