Added better field verification -- essentially a manual merge between
test and Todd's great search function. JUnit tests need to be redone