Adding the last tests