ComS 311 HW7 Update, testing complete