slow progress getting all tests green :-(