Parser: Remove from library and add them to unit test