Tests fixed
class methods replaced with convenient init() methods
domain mask replaced with short version