Fixed issue with new tests