code clean up + update of test results