Add waffle switch to tests