Fixing some problems with the tests