added support for simple test fields