Unecessary class. Initialization logic is now done by a event handler.
Merge remote-tracking branch 'upstream/master'
Fixing test cases.