bug fix, plus added another test driver