Added testing + preflight