Improve Unit Test Gateway