Fixes for the system tests to use the new 'align_id' args.
Authored by: bugman 2009-10-07
Parent: [r9614]
Child: [r9616]