dataset tests now pass, still have to upgrade viewers