added more tests and a finished off the page servcie