Solved Toaster test failures (especially on travis)