Rename test methods to better ones
Fix "shadowing outer local variable" warning
Remove unused parameter
Update copyright notices for 2014