Fix #4 Happy to see tests work now