move files
fix tests
Remove debug statement