Moved existing tests to tests/integration and written real unit tests
Removed debugging