Fix unit tests pt 2