Continue implementation of army window
new tests in testGI