Version updated
Tests added