Merge pull request #1 from jreyes33/master

Tests refactoring and minor fixes