Initial add of tests