make test: code cleanup