Made interfaces more testable