Merge pull request #81 from tkrille/cleanup_tests

[fix] removing last residues of toScim in entities