Minor edits
Finished alignment tests