Add tests and border collision