Fix trivial tests..