Fixing tests that now touch the in memory databse.  Bit messy right now but works