More secure tests part 2