Fix Tests
Merge branch 'tweaks'