Minor corrections and unit test updates