Deleted test file and changed some code