Added the last tests