Fixed unit tests, #983