Parser tree rule generation cleaned up, new rules added, some basic test cases added