Bug fixing
Added test tool