removed id_test. Moved to Waldo master.