Added more transitions, updated tests.