Updated test formatter