'on-service' page is added, broken test is fixed.