Updates to unit testing