Updates to unit tests