Fixes for all tests to pass