moved test in right directory
Removed dead code and commented some features