Testing Fixes