Add small fixes for tests