Fixes all tests