Replace .unwrap() by .expect() where appropriate
Revert "Now using cargo test command"

This reverts commit 789dd3fb3a901cf7143b753a4a71b97e8396a327.

Conflicts:
	.travis.yml