Updates for the Mozilla-IT infra

Addition of tests as well as merged a bugfix for 3.0 compatibility