coverage and test: Add tests