test mode updated to use new modes