Add report code and test code