Result fix and tests