Minor clean-ups
First pop-server test test