Adding tests
Patch used when building with Jenkins