Merge pull request #187 from bhamail/test-getFieldOrder

Test runs under linux and Structure fixes all pass, so I will commit this. build.xml changes still need cleanup. Please holler with any other suggestions.