Few fixes + test results.