Continue rename of organisation into company
Organisation -> Company
Refactor test names