fixed some Testing issues