Make tests byte-compileable and update (refs #4)