Refactor some method names
Add the bottom right test