Update fixtures to work with overhauled AbstractService