Fixed duplicate interfaces, improved InterfaceTest case