Test added & bug fix