improved testing + fix for long alignment