Test2 Fix

Some small merging fixes