tests repaired for service layer