make test: early core detection, code cleanup