#81: Add 7 further fields and test