cleanup
added tests for recursive fields