added more codes to test driver