Upgrade to airbase 28
Cleanup tests