Fixing Tests

This now should lead to green tests.