Most recent merge

Pull from here for creating tests, then merge into here.