Moved test code into separate folder