(PUP-659) Fix tests after rebase

Tests were added/modified that passed an empty name space to
the find_definition method and this method is changed in the optimized
version.
(PUP-659) Remove commented out code