Used more accurate interface in test cases