Add colon
Add more unit/integration tests and coverage support