Modify bin/spec from the one of test_cleanup branch. Working on it