Update test results.
Code cleanup