all passing, not quite happy yet