Updated hand tests and class logic