some modifications for cleaner tests