Minor updates to unit tests