Make tests use sigils
Merging master