Dev2

We don't need two branches anymore, I am taking over the test development