Additional tests, parse and structure