improving the metro example tests