Added additional unit tests for the instructions.
Merge remote-tracking branch 'origin/slim_refactoring' into slim_refactoring