cleaned-up tests, removed duplicated tests and moved some tests to the correct component
added countable and IteratorAggregate to FieldSet and increased testing coverage
improved testing coverage