updated default parameters
removed incomplete tests