Merge "Rework background manager and add TestCases"