Added missing test
Removed dead code