Refactored tests amd code. Planes are ready to go.