enhance code an testing environment