[GREEN] Fix all tests