Added tests for shims