Add some tests for Maintenance

Change-Id: Ic848ff9533b353d55922bb04aaa72e44827f9161