Updating tests file Cleaning up