Unit test user find by

I'm having a little bit of trouble separating my pull requests right, so for now, we will just have to merge the last one.  I think I have it figured out and will try using git add -p on my next request and hopefully will be able to only push the new changes.