Moved all lines & expected into objects so we can build one MasterCfLinesTest
Tidied up