Add missing parts for testing coverage