* changes: Fix test breakage due to naming collision in the linker. Minor cleanup of unused headers and overly described functions.