Update tests to green