Add extra tests for importing zeros
Fix tests