Refactored test data to depend on names instead of ids