Test renaimed and minor code format changes