Fixes test and removes some un-used imports