Green tests. Cleanup comments