final tests fix