Improved assertCurrentActivity()