Debugging and moved test code into separate folder