coverage report hinted one content handling was not done entire correctly, add more tests and fix exceptions