Updated test and funtionality