Add final tests