fix exit code
use merged test
fix test