Fix field naming issue within unit tests