Re-organize the file tests

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Fixed deletion of files not in parent

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>