Some cmake cleanup
Do not explicitly close main window in unit tests
Add return to non void method