more tests are working, nearly done...