Merge "Add new test module for system service with static / final mocking"