Fixing a few tests and find methods.