updates to fix some unit tests, updated When Library