Make tests pass , closes #195

- Changed tests to expect syntax
- Merged dev branch
- Fixed all failing tests.