Improve page test