Add tests and code for Border Village and Farmland
Code review fixes