Tests created
Tests modified
Merge pull request #118 from olavin/develop

Tests added