Changed some methods to use dataset interface
Tightened dataset interface by being more specific on some returned
iterators
Removed unnecessary class specifier for some constants
Revert "TESTING: re-enable tests which weren't ignored anyhow (issue exposed when we updated the version of Ant)."

This reverts commit b87e9d7be3799889d15648c5fa6722945aea4c1a.