Unit tests silently broken on master

[vkarak]

Pull request #266 has broken the unit tests in a way that effectively cancels their execution midway. From 397 unit tests before the merge, only 245 were run afterwards!