Fixed doctrine based tests