update to testing framework and indentation fixes