Increase test coverage to 52%