Changes to support Unit testing of projects that consume this library