Minor cleanup of test module