Refactored tests

More specs migrated from dul-hydra