RevisionTest code style fixes & file split