tests for 4_6 recovered after merges