Added tests, linked to page, misc. tweaks