Turning tests from red to green (92 / 150)