Restructuration
Added caret testing