Test + pages service implementation (I think a db refacto is very needed)