Updates and reorganization of tests