Moving to adapter classes, common.filters and 100% test coverage