fix bad test variable naming and seperate test expectations