First unittests added
Merge branch 'develop' into pre-master

Conflicts:
	tests/test_solarflux.py