Updated test implementations as well.