Fixed broken tests.
Cleanup.
Reduced methods visibility.
Removed useless argument.
Some more tests.