Splitting off ui from adapter
updating ui tests