More and seperate tests