Enhance Test Coverage in GDK
issue