Fine tuned testing parameters and added tests