some tests now working