fix
reorganize tests