changes derived from #452
something changes with these tests