added and modified new tests