Test refactoring and issue #10: adding support for composing update jobs