Added the start of tests

Conflicts:
	main.cpp