Change constructor arguments
Add HeadquartersTest, fix constructor