Change test to not 0 out the product
Refactor fun1' for great justice