Added shim-test