Fix unit tests. Thank you crynobone.