Testingv1

Debugging and writing tests.