Restore overwritted tests, fix test executable