Making progress towards green build
Make tests 3 seconds faster