Fix for running unit tests against client code