Added testcase files
Refactoring to use near, also closes #25