Add test for zero, fix behavior