Fix a Makefile issue, and add a test exposing an OSR bug