Added final tests