Initial Testing/tutorial changes

Done while I was in the tutorial