More unit testing updates