Generic refactoring/cleanup. Added test binary files.