Add test specs - WIP