Update tests accordingly.