Reorganized imports.
Test added. Parser impoved.