Added some test functions.
Fix some coding standards.
Merge pull request #330 from jonathangreen/7.x-rename-tests

Added some test functions.