Fix bus arrival.
Fix maman and improve the tester.