Lots of updates to get tests working and ready.