Enhance the simple test code