Some bug fixes
Remove test