Updated license header, and reverted test names to camelCase. Also
removed redundant null checks.