Multiple test cases cleanup.

Signed-off-by: crynobone <crynobone@gmail.com>
Additional fixes to locate() test cases.

Signed-off-by: crynobone <crynobone@gmail.com>