Bugfix: fixed ConcurrentModificationException resulting from this code
Changed related test files to test for multiple attributes