Split instruction tests and refactoring
merge