Fix for fix for issues #34 and #42

Hi,

good catch! I've had a closer look at this and the two tests hitting the breakpoint were actually implemented incorrectly. My first commit in this PR corrects those tests. The second commit changes the lookup as you suggested. Now it just searches for a *local* copy in the set / context instead of also falling through to the database.