Merge branch 'master' into test
Added more tests.

1
Tests: Friendler error messages.
Merge branch 'test'
More friendlier error messages.