Fixed so it dont take the instance of another page type and fixed failed test