Dev commit from 28.3.14.
Tests are in a proper form now.