Replace actual holder classes with their custom variations to ease cache testing. Also remove excessive tests for 'direct' holder containers