more updates to unit tests