Rename reader method to return found cell
Refactor Test to use constants