Bcipolli ka test lite

Fix for test failure identified by @gimick. Note other changes merged into develop have snuck in here too. Ignore.