JSHint-related fixes.
JSHint-related fixes.
Test code style improved.
Development code merged.