added fixes to testing