changed to new tests