Adding tests (reworked, with pages)