Add/enhance unit tests