fixing lots of unit tests