Issue #29: Adjusted aligner and test bug I have bugs