Cleanup

 - Fixed the encoding issue
 - Broke out the element tests