Refactor tests for UI alterations