merged the test
fix the test