Add test coverage for existing code