fixed last tests