Fix unit test. Removed unused files. Apply condition check before
running transition.
Delete unused classes