finished refactoring test code..
finished refactoring test code..

git-svn-id: 7cba09b10a0c8528f7f4b4e27076c139153a736a@5051 a8237c23-d22b-0410-ac1a-db40f18c2caa

benedictpaten/sonLib,benedictpaten/sonLib,benedictpaten/sonLib,benedictpaten/sonLib,adderan/sonLib,adderan/sonLib,adderan/sonLib,adderan/sonLib,benedictpaten/sonLib,adderan/sonLib