More updated tests