Applied patches and all tests work!