Some tests

SOme tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	MasterNodeApp/MainWindow.xaml.cs