finished part 2 and fixed popup test