Add some small fixes for tests