Restructre testing directory
More file reshuffling
Add more tests