Autocloseable funcationality and More Tests.