modified files for  improved testing functionality