Updated tests configuration, avoid circular imports with new dal