Some cleanup work in testing.
Added nonintrusive galerkin code from dl and hgm into testing