Add some ugly element to the test. Begin code reorganization