updated to new tests