Added beginnings of tests