Added 1 more test and removed some unused code