final fixes and test results