Fix test error
Fixed tests
Merge pull request #67 from jjmerino/develop

Fix tests