Files renamed and added test descriptions.