Refactored tests into own test classes that automatically cache results