+ genericised some fixtures
+ couple of tweaks to ensure code behaves in test context