Improved code coverage
Removed magic number violations