Add test and models