WIP Tests
Merge branch 'WIP' of https://github.com/GP-S/HOTS into WIP