Added another test and removed some unused functions2