Extract assembleLineTest
Add support for addu