Legacy project test and refact