Added basic tests, fixed parsing bugs. Added TODOs.