Fixes for failing tests

Here are fixes for some of the currently failing tests.