Redefined emitter Ids to contain emitter class
Renamed and commented a few classes.
Added failure test cases.