Align for NW done, not passing tests