Company number variable into constants
Introduce Test_Suite2
Minor changes