Enhance the test program. Not complete yet.