small fixes updated tests