A few additional tests now pass