Fixed sql query
Improved testcover target
Added ability to define nonrepeated tracked ways
Increased test coverage