reorganize tests architecture