Updated for the latest tests