Add test cases for multiple fields. Closes #5