Added e2e testing

Added e2e testing and did some cleanup on the code.

Also working on evaluating tree view controls.