Fixes for setting up tests