restructuring

Resttructring so that new test versions can easily be added.