Some updates to the unit testing