tests: restructure to get rid of headers and to change test hierarchy