split_test reorganization;
Small fixes;