Refactoring test class and add screen transition