All but two tests now pass