Renames and improves added test.