Clean and format code

Clean the testing code.
Sun Jul 27 10:42:12 CDT 2014