Tweak Ideabox TDD. Fixes #696. Fixes #694