Merge "Remove dead code from tests." into devel/master