More tests for zero data, also removed bad paths.