Move tests to green