Suggestion for refactoring interface for consistency, added frame for cpp tests