Code cleanup and fixes to license header

Removed unused test file and updated copywrite to WicketStuff in places
I missed.