refactor test include files for list them in one file
refactor test registry for testing