Added parametized tests