get openlmis tests running
fix failing test
fix/cleanup openlmis tests
tweaks to data_source tests (still failing)
Merge pull request #2363 from dimagi/ct-testfix

test fixes and cleanup