Fixing reported issues (naming, some tests).