Add updated tests