Code simplified
Safer assert_equal comparing int to int