add simple logic for UI state
add skipped tests