added and updated tests