Removes testing deprecations

Also some reformating