Added more test fields