More tests and the fixes to make them pass.