Upgrade testing to use 0.17