Removed break point
Improved test coverage