Fixing some tests, prevent fatal errors