More green tests
All but bonus tests now passing