Update imports.
Only test wafer.
Merge branch 'master' of github.com:CTPUG/wafer