removed unused code
new test mode