a small fix
Merge
various fixes
Merge
updated golden outputs and removed irrelevant tests