Made unittest work again