Add test coverage tracking
Add/refactor specs, improve test coverage