Updated existent tests.
Reworked parsing.