Refining tests
Gold samples generated, more debugging. Praying.
Merge