Tests almost back to passing