Decomposition improvements and two-source test for accuracy