Merge "Removal of useless tests"