New method added plus minor fixes

Tests finalization

Whitespace fix.

Warning fixes.

Whitespace warning.