Changes for the right working on bologna, update the test GUI and Unit Test