~ removed unused class arguments ~ fixed : imports are now relative so they can be imported from tests