test cases modified according to api changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/vimarsha/mediator/DefaultMediator.java