Moved to tests and added alignment plotter