TEST: added unittests for instructions refactor
fix more tests
Merge branch 'feature/instructions' into feature/instruction-arguments

Conflicts:
	conda/instructions.py
	conda/plan.py