Swift test bugfix
Tests improvements