Fix unit testing