1. Remove macro from simple; 2. Add a test case;