Add test and functionality