Removed comented packages and little fixes
Tests refactor