Fixed half of the UT failures - still investigating the rest