Attempting to get unit tests working. This push breaks the build. Uploading broken patch just to shw Sean.