Last update of original tests, in next commit they will all be gone