Improved build matrix.
Fixed test command.
Merge pull request #74 from thedrow/patch-1

Improved build matrix