Migrating improvements from CentOS & adding test stubs