Add stub class and testing for system 2