Fix broken US English.
Move test down a bit.
Be more pendantic with test scenarios.