added testing layer
improve testing stuff