Pulled changes from trieng. Removed old clutter (test.hpp).