restructure tests, start getting greens