Add initial round of tests