Minor tweaks, added more tests to see Istanbul in action.