Small fixes for tests to pass