After some toying around with lettuce etc, I decided to go back to unittesting. We'll see if this needs to change again.