Programming Assignment 2, updated test