Assembler: Restructured again to fix test discovery