Fixing up some tests that failed when testing the whole application.