Changes: pass all tests