Split instruction tests and refactoring