Fix tests and formatting issues
Merge pull request #37 from sunny-mittal/sunny

Fix tests and formatting issues