Template formating clean-up
Add rspect tests for diamond::collector and diamond::handler