#3209 fixed unit tests. There is one unit test still failing.