Adds tests and page expansion