Adding tests, fixing typo and base for v1.1