Added tests, and a new page