update target names, simplify test build