add back mising tests from master