Started on PageService tests and fixed a few bugs