Slight changes to timer_test and api

Don't keep the includes alphabetized!!!

Commented out print lines