Rearranged some methods in page
added more tests