Tried to modify tests to boost coverage %