Adding another test, removing an unused file