Resolved FIXME regarding device error causing hook for common test. Ensured that added method on window is removed during tear-down.