Fix a test
Fix some tests
Fix some tests
Remove duplicated test