removed test related modifications
0.6.3