Added alignment tests / fixed failing wrapping unit tests.