Remove old test, fix unused Variables