added a few new automatic tests. Old ones are deactivated.