Tests refactoring. Unit tests for SchemeResult added.