Test2 Fix 2

merging fixes