reorganization once the tests were debugged