Significant changes to the application start state since last commit. Encapsulated unit test so I could run when needed. Also removed dependecy on v7 library linkage.