Temporary fix for unit tests