Some tests failing, rename and stripping started as detailed