Add fields partial, with modified tests