tobiasbrunner wip: tests adapted for different SA cache