extend test coverage
exclude Interfaces from coverage
reduce cyclomatic cimplexity
ignore coverage of MaintenanceException
Merge branch 'develop'