simplify test class
make parser class more extensible