Rename some fixtures for consistency
Finish testing cache, looks good