added primitive support to reforge, and fixed several tests