Updated test and stuff