Support `make test`

and added a test for my work on the shims.