Partial, need to get all tests running consistently