Some more work, added tests. added bigger sqm file