Extracting interfaces
Added UnitTest