More mouse test cleanup