More tests, fixed problem when coming off branch that created station. Closes #2