Fixed the last tests