TEST: added unittests for instructions refactor