Addressed all of Marius' comments from the previous checkin.
Fixed up as many unit tests as I could. There are between 13-16
failures left.