improve includes
reorganize tests