update with new tests