Refactoring and increased test coverage.
Merge branch 'master' of github.com:unicefuganda/edtrac