Unittests and fixes for failure where extractor values are 0