Some Fixes for green tests
Fix