Fixed unit tests following 74d9946db37591c83b0a59b8359ebc35259908fb