Changed test system the way SeH recommended, and adapted test cases. Only 5 not working currently.
Merge origin/master