More compilation woes, but this time add some tests