Additional parsing tests
Improve code organisation
Ensure we have 3 parts
Started adding range tests