Add massive test (doesn't pass for now); fix #7