Fix line bug & add fixtures