Add and tried some tests