Removing commented out code
Moving tests to the root level