Increased test coverage, removed unsafe
Increased test coverage
Additional test coverage
Increased coverage