Updated Test Classes