added test for Envelope and Grid
reformatted files module