Cleanup of Tests so it will do clean/install