Added station tests back into the mix.