New SIT test; moved cleanup code to a file of its own