Expanded tests, added simple search, added field arguments