New and updated tests