Added unit testing for PopulateFields