Add test for names services
Add test for restapi service
Fix some alignments