Adding needed refs
Updating tests to verify references. Fixing output folder