Updated s.t. tests works