reorganize problems and tests