Added / organized Tests