Some stuff. Fixed up tests. Kind of.