more structure parser tests
added more structure parser tests and modified it so they pass
tidied up imports
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_storage/tests/test_structure_parser.py