optimization and better test coverage
remove todo
Merge branch 'master' of github.com:Fusionfarm/billtracker