all old tests now passing