Fixing up some tests.
Merge branch 'master' into dev
find('all') and find($id) working