fixing tests
question spec
better decoupled parser