4-th lesson

Added navigation and test optimisation