Added seperate tests