Improve/Fix unit testing