Added mutual authentication test and cleanups #453