Merge proposals dependent on lp:~tchaypo/testscenarios/unittest2

lp:~tchaypo/testscenarios/unittest2 has no merge proposals.