Rearrange some frontend tests so that they are in a relevant describe section, and make the server autoconnect test test against the correct function

I noticed that these weren't quite right when I went to try and do some work on them, so I refactored them separately.