This should be updated to include the new tests