Removed binary that shouldn't be in the source tree
Cleanup of imports
Only import the serialize library when compiling test suite
whitespace and indentation